xend: Continue domain building even if memshr extensions are not

present in the hypervisor.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 144f4f846a11a51c28a5f0d4d74b94de6e0b0653..1983502a2e208392f5f12d89ab22be476504add4 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -830,8 +830,10 @@ class HVMImageHandler(ImageHandler):
         self.acpi = int(vmConfig['platform'].get('acpi', 0))
         self.guest_os_type = vmConfig['platform'].get('guest_os_type')
         self.memory_sharing = int(vmConfig['memory_sharing'])
-        xc.dom_set_memshr(self.vm.getDomid(), self.memory_sharing)
-
+        try:
+            xc.dom_set_memshr(self.vm.getDomid(), self.memory_sharing)
+        except:
+            pass
 
     # Return a list of cmd line args to the device models based on the
     # xm config file